From bc312dc3768b39c47215009245d08f153854bdec Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli>
Date: Wed, 6 Jun 2007 22:36:32 +0000
Subject: [PATCH] Welcome "navicache" in the world of gbfile.

---
 navicache.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/navicache.c b/navicache.c
index 43df0755d..3393a3323 100644
--- a/navicache.c
+++ b/navicache.c
@@ -25,8 +25,7 @@ static XML_Parser psr;
 
 static waypoint *wpt_tmp;
 
-static FILE *fd;
-static FILE *ofd;
+static gbfile *fin, *fout;
 
 static char *noretired = NULL;
 
@@ -210,7 +209,7 @@ nav_end(void *data, const XML_Char *el)
 static void
 nav_rd_init(const char *fname)
 {
-	fd = xfopen(fname, "r", MYNAME);
+	fin = gbfopen(fname, "r", MYNAME);
 
 	psr = XML_ParserCreate(NULL);
 	if (!psr) {
@@ -227,8 +226,8 @@ nav_read(void)
 	int len;
 	char buf[MY_CBUF];
 	
-	while ((len = fread(buf, 1, sizeof(buf), fd))) {
-		if (!XML_Parse(psr, buf, len, feof(fd))) {
+	while ((len = gbfread(buf, 1, sizeof(buf), fin))) {
+		if (!XML_Parse(psr, buf, len, gbfeof(fin))) {
 			fatal(MYNAME ":Parse error at %d: %s\n", 
 				(int) XML_GetCurrentLineNumber(psr),
 				XML_ErrorString(XML_GetErrorCode(psr)));
@@ -243,20 +242,20 @@ nav_read(void)
 static void
 nav_rd_deinit(void)
 {
-	fclose(fd);
+	gbfclose(fin);
 }
 
 static void
 nav_wr_init(const char *fname)
 {
 	fatal(MYNAME ": Does not support writing Navicache files.\n");
-	ofd = xfopen(fname, "w", MYNAME);
+	fout = gbfopen(fname, "w", MYNAME);
 }
 
 static void
 nav_wr_deinit(void)
 {
-	fclose(ofd);
+	gbfclose(fout);
 }
 
 static void
-- 
2.30.2